From 62b70bedca3d6b0f8c53a459e53a5de19b9a1041 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Mon, 11 Apr 2016 14:33:34 +0100 Subject: [PATCH] xen/arm: acpi: The boot CPU does not always match the first entry in the MADT Since the ACPI 6.0 errata document [1], the first entry in the MADT does not have to correspond to the boot CPU. Introduce a new variable to know if a MADT entry matching the boot CPU is found. Furthermore, it's not necessary to check if the MPIDR is duplicated for the boot CPU. So the rest of the function can be skipped. [1] 1380 Unnecessary restrictions to FW vendors in ordering of GIC structures in MADT Signed-off-by: Julien Grall --- xen/arch/arm/acpi/boot.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/acpi/boot.c b/xen/arch/arm/acpi/boot.c index 859aa86afa..1bba1cf6a5 100644 --- a/xen/arch/arm/acpi/boot.c +++ b/xen/arch/arm/acpi/boot.c @@ -37,7 +37,8 @@ #include /* Processors with enabled flag and sane MPIDR */ -static unsigned int enabled_cpus; +static unsigned int enabled_cpus = 1; +static bool __initdata bootcpu_valid; /* total number of cpus in this system */ static unsigned int __initdata total_cpus; @@ -71,10 +72,15 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor) } /* Check if GICC structure of boot CPU is available in the MADT */ - if ( (enabled_cpus == 0) && (cpu_logical_map(0) != mpidr) ) + if ( cpu_logical_map(0) == mpidr ) { - printk("Firmware bug, invalid CPU MPIDR for cpu0: 0x%"PRIx64" in MADT\n", - mpidr); + if ( bootcpu_valid ) + { + printk("Firmware bug, duplicate boot CPU MPIDR: 0x%"PRIx64" in MADT\n", + mpidr); + return; + } + bootcpu_valid = true; return; } @@ -83,7 +89,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor) * all initialized entries and check for * duplicates. If any is found just ignore the CPU. */ - for ( i = 0; i < enabled_cpus; i++ ) + for ( i = 1; i < enabled_cpus; i++ ) { if ( cpu_logical_map(i) == mpidr ) { -- 2.30.2